From ce8d8388d630fa936500e6843496afe113ad8bc5 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Thu, 6 May 2021 15:25:12 +0100 Subject: Windows: remove extra newlines in backtrace (#5218) - Remove DLL lines, not generally needed. --- src/OSSupport/StackTrace.cpp | 2 +- src/OSSupport/WinStackWalker.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/OSSupport/StackTrace.cpp b/src/OSSupport/StackTrace.cpp index d252e1e83..0520b4325 100644 --- a/src/OSSupport/StackTrace.cpp +++ b/src/OSSupport/StackTrace.cpp @@ -26,7 +26,7 @@ void PrintStackTrace(void) { virtual void OnOutput(LPCSTR szText) override { - puts(szText); + std::fprintf(stdout, szText); } } sw; sw.ShowCallstack(); diff --git a/src/OSSupport/WinStackWalker.cpp b/src/OSSupport/WinStackWalker.cpp index 1a95b2907..a48ce07aa 100644 --- a/src/OSSupport/WinStackWalker.cpp +++ b/src/OSSupport/WinStackWalker.cpp @@ -1154,6 +1154,9 @@ BOOL __stdcall WinStackWalker::myReadProcMem( void WinStackWalker::OnLoadModule(LPCSTR img, LPCSTR mod, DWORD64 baseAddr, DWORD size, DWORD result, LPCSTR symType, LPCSTR pdbName, ULONGLONG fileVersion) { + /* + // Uncomment to be notified of loaded DLL modules. + char buffer[STACKWALK_MAX_NAMELEN]; if (fileVersion == 0) { @@ -1168,6 +1171,7 @@ void WinStackWalker::OnLoadModule(LPCSTR img, LPCSTR mod, DWORD64 baseAddr, DWOR _snprintf_s(buffer, sizeof(buffer), "%s:%s (%p), size: %d (result: %d), SymType: '%s', PDB: '%s', fileVersion: %d.%d.%d.%d\n", img, mod, (LPVOID)baseAddr, size, result, symType, pdbName, v1, v2, v3, v4); } OnOutput(buffer); + */ } -- cgit v1.2.3